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