| commit | a4b20d712b9c6cbc562529d3a41bf8ea1515562a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:22:41 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:22:41 2013 -0700 |
| tree | 259692b9abecd9c451413631c7b2ab83be7d16ee | |
| parent | f61e50201b7d5e793a479979c304d3388ca1405f [diff] | |
| parent | b8e1033c5b5813cb97d19645075591a357e9f04a [diff] |
am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'b8e1033c5b5813cb97d19645075591a357e9f04a':