diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-01-29 08:16:23 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2013-01-29 08:16:36 -0800 |
| commit | 756dafc33b350fc8673f6dfe4a10172299d1a42d (patch) | |
| tree | 77bc700e02305df3132f1ef07319e8b451704066 | |
| parent | 51f84bac2813061191f205a07fec798b434ab00a (diff) | |
| parent | b376b2ccf5074faeec8833a7c2c0fbf18f558d53 (diff) | |
| download | android_device_common-756dafc33b350fc8673f6dfe4a10172299d1a42d.tar.gz android_device_common-756dafc33b350fc8673f6dfe4a10172299d1a42d.tar.bz2 android_device_common-756dafc33b350fc8673f6dfe4a10172299d1a42d.zip | |
resolved conflicts for merge of b376b2cc to jb-mr1-aah-dev
Change-Id: I910199bb91900462e51a24b57e490ea22c6ff15a
0 files changed, 0 insertions, 0 deletions