| commit | 4a7ec0f3947b8e0e8356c1aec343ea599f6ffbba | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:28:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:28:31 2013 -0700 |
| tree | 606f691bcbbb7964a2b24c37cae1629f08b3a7fb | |
| parent | c262ac6b02f84e25e98b0d5f74bb2f20ab37db1b [diff] | |
| parent | 8efbf9e5917ca3c0fa41fab32089f00f5950c88b [diff] |
am 8efbf9e5: (-s ours) am 53e16ebc: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '8efbf9e5917ca3c0fa41fab32089f00f5950c88b':
