| commit | f8ce1ffaa61d50b244dd89e25fa2b2beb204f786 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri May 17 13:01:13 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 17 13:01:13 2013 -0700 |
| tree | 0275f0fb4a55afce2f03843de445ff45d9643721 | |
| parent | ec6e5d37be1aee9c5c3478fe8c50cce71cfeb325 [diff] | |
| parent | eb724ddbe92ba4c090fafad42ca65af4fd8d5143 [diff] |
am eb724ddb: (-s ours) am 7f78bd5e: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'eb724ddbe92ba4c090fafad42ca65af4fd8d5143':