commit | 3c0a4c030282a90f214d9cda60d4c96fd16cabfb | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 11 14:57:01 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 11 14:57:01 2013 -0700 |
tree | 4c18bfeed57ca787e145cc5d24ef1b9419b11bb9 | |
parent | f463cbe24d01a8a689585b74f82433a0c0f4e7d3 [diff] | |
parent | 866885101a68561c47ca12f8e88b1f97e68e0eb8 [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: I4bac19c3294083d1e1080cd4290165b7634fd7f4