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

* commit '4f3842faabc8fc85e62f29dd88f3ef0f950f84a1':
  Fixed inline initialization of non-integral static const member
main
Jean-Baptiste Queru 2012-08-24 14:19:11 -07:00 committed by Android Git Automerger
commit b3f517b0aa

Diff Content Not Available