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

Browse Source

* commit '5f67769903dfb3e459ea8d42e50289ec300fe983':
  Fixed inline initialization of non-integral static const member

main

Jean-Baptiste Queru 2012-08-24 12:55:59 -07:00 committed by Android Git Automerger

parent edda38a3db 5f67769903

commit 642ad495e2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available