commit | aca1bb4ab86f3b27df72db37cab6bc3ccca088a9 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 14 14:03:38 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 14 14:03:38 2012 -0800 |
tree | 4440bce283e82623f5f1ccf7e647d025a5b61588 | |
parent | 6d3925ce5b86c27672289fa8e29bb9229085c1ea [diff] | |
parent | 6db1e2495d1a9677d508b51cfd51c4f37f729551 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: Ida52d4ffe46a6805df540f684465dcd46db71945