| commit | e14bee15e5bb044f38da38ef00d3530a326f07a5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 18:04:00 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 18:04:01 2013 -0700 |
| tree | a5bf8b98d7d0a5fc0529e9d894f5d75a2c43cccf | |
| parent | 136698a4ff7a46eb5d7857d1e8bd4fc1afcc8463 [diff] | |
| parent | 9fe3f5e3b0174d529d3fb845e0b0ffb9d84837cc [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: I61c2e7abaae34978e88c581f67e72bf45d4ebafb