| commit | e53461a8db44e66023b87a4b4f249e9fa4689366 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:13:33 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:13:33 2013 -0700 |
| tree | 38e7a79da20cf168bc915745e26ce95f226627e3 | |
| parent | 9f662b7d0561a46a0250702385084c48efe9ca24 [diff] | |
| parent | 129a87f9bde4bff575607ebb3ce330161200aec3 [diff] |
am 129a87f9: am 6b0409db: (-s ours) am 92be9d34: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '129a87f9bde4bff575607ebb3ce330161200aec3':