| commit | 7b52eac491e6a97c6ef87cbcb08e5f902c10c9e3 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:00:40 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:00:40 2013 -0700 |
| tree | 3a2d0c289e0ead79c8df7d582fa043bc8f975f0c | |
| parent | db6f21c6792fe07a733572e1d4978f46b5462c35 [diff] | |
| parent | 99a7231d50daaacbdb35513b327b475d4de44e3f [diff] |
am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '99a7231d50daaacbdb35513b327b475d4de44e3f':