| commit | 14367f5b4041d5a29fdb349e8058ac5ef11d805d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:42:00 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:42:00 2013 -0700 |
| tree | f2b436b2d058da22de6c88f1a3f2c2fa839adf89 | |
| parent | 2fd0058c0204b60966a77265e75bfbc471416aa8 [diff] | |
| parent | 438fa99e5c16a6a3f77cfc73771ff20421bbe9f2 [diff] |
am 438fa99e: (-s ours) am 68a406b3: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '438fa99e5c16a6a3f77cfc73771ff20421bbe9f2':