| commit | eb82cca7f4b40bfb9aada2dfa56595d9e3ff1eda | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jun 13 22:33:07 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 13 22:33:07 2013 -0700 |
| tree | e2db39ccfe47b2c53d09a41fda250da8298ea8f7 | |
| parent | 858dfecf6db216e3a9ff30b6a38a8e1bf6da6733 [diff] | |
| parent | 381868f347d413a671a6ad9c0af64d258a060b99 [diff] |
am 381868f3: (-s ours) am 840d233c: am 800e4320: am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '381868f347d413a671a6ad9c0af64d258a060b99':