am 642ad495: am 5f677699: (-s ours) am dbe3ac45: Merge "Fixed inline initialization of non-integral static const member"

* commit '642ad495e29a6d4e64211be1a09ad9a18df4af3a':
  Fixed inline initialization of non-integral static const member
main
Jean-Baptiste Queru 2012-08-24 12:58:32 -07:00 committed by Android Git Automerger
commit 4f3842faab

Diff Content Not Available