commit | 642ad495e29a6d4e64211be1a09ad9a18df4af3a | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 24 12:55:59 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 24 12:55:59 2012 -0700 |
tree | 7af27d9c040df8098b079cce94e8f61036afb97e | |
parent | edda38a3db6a2c84af47d4888a94d24a054e2b88 [diff] | |
parent | 5f67769903dfb3e459ea8d42e50289ec300fe983 [diff] |
am 5f677699: (-s ours) am dbe3ac45: Merge "Fixed inline initialization of non-integral static const member" * commit '5f67769903dfb3e459ea8d42e50289ec300fe983': Fixed inline initialization of non-integral static const member