| commit | 33adccd203ee8303cd0bf489e3f072d362e1705d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:00:49 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:00:49 2013 -0700 |
| tree | 260be3ae7acecccb7ddf72a06a913149ee41661c | |
| parent | d0a9d5b6e0b557c3796616791fd3ac93d12bcad9 [diff] | |
| parent | 9cff5e3f4a534c5472b8a8e269f34cdca2ebff8c [diff] |
am 9cff5e3f: am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '9cff5e3f4a534c5472b8a8e269f34cdca2ebff8c':