| commit | 053f30bb2cb3fc9f974e37489075c8d8961a8d2e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:13:30 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:13:30 2013 -0700 |
| tree | b9cc54eb96ef3919248a635df5fbe2b78944de0a | |
| parent | 65a94f0f3b42be8a215c5f23b6a01db3eb5887eb [diff] | |
| parent | e6e38b086382207177f91d70188363ce3fe7758d [diff] |
am e6e38b08: am 49d89c07: (-s ours) am 31173957: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'e6e38b086382207177f91d70188363ce3fe7758d':