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