| commit | c3f789fd917ba413be8b6f73f87e49a8773bea41 | [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 | 750c41a85bb4a942522417fdce6c456c54c801d3 | |
| parent | 5dc243723bec5ff5d77c5553ac5156980b3748d4 [diff] | |
| parent | 7b52eac491e6a97c6ef87cbcb08e5f902c10c9e3 [diff] |
am 7b52eac4: am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '7b52eac491e6a97c6ef87cbcb08e5f902c10c9e3':