commit | 064d252918c23cc4c90f8bc62f9ae47ba7afa4d5 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 10 15:19:43 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 10 15:19:43 2012 -0800 |
tree | 08237c5cdc51537ab4b99c92395e78ad97142a78 | |
parent | 50f8d2856b6644059b31684687842bf9c1f2e814 [diff] | |
parent | 4f9fb2ba977c6ed119211fd43ff1ece9ba163fc3 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I97991f966ea0d3a6f3bad87c82d9926d55e6d63c