| commit | fc14d52cb87f5e43a37477a4fc0bf48179d4aff3 | [log] [tgz] |
|---|---|---|
| author | keunyoung <keunyoung@google.com> | Mon Apr 01 16:09:48 2013 -0700 |
| committer | keunyoung <keunyoung@google.com> | Mon Apr 01 16:09:48 2013 -0700 |
| tree | cc4b681517cf3487168503a21bb89bea2938308a | |
| parent | 09bcda8e304dfc8e59dc7963b5db1f16274b0f90 [diff] | |
| parent | 99eefc24f2836c743c0cb9ace6d7bf4b45f3f3f0 [diff] |
resolved conflicts for merge of 99eefc24 to jb-mr1-dev-plus-aosp Change-Id: If88e8260e8186b9825e5d1011213e06020d74277