diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-11-06 12:16:24 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2012-11-06 12:16:24 -0800 |
| commit | 688b235bfbad9fcd60fbc44ef4bb2c23bb94e241 (patch) | |
| tree | d5f9daedb45d28c7ae2ebe1b325d99464becab83 | |
| parent | 232b56aaa83c04c5858efc2288185e84084eac33 (diff) | |
| parent | 26042e844473a3480615a914d4539d0c6563e159 (diff) | |
| parent | 530beda34c2082a2e2866f5a673c004dcb15c992 (diff) | |
| download | panda-688b235bfbad9fcd60fbc44ef4bb2c23bb94e241.tar.gz | |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeandroid-cts-4.2_r2
Change-Id: I52be076166579c8292066f388720b63054e8d7ea