| commit | 14e2690970a2936941871a9c1c257b32b95303bf | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Apr 04 23:39:33 2013 -0700 |
| committer | Kenny Root <kroot@google.com> | Thu Apr 04 23:39:33 2013 -0700 |
| tree | 3f37922a45e1b6755e1072a1022d95c36b349bcc | |
| parent | e827f221ea157baaa6edc8ee8d62b1be79c7e264 [diff] | |
| parent | a2f747d48d8c2438b71c0ca980b221e1076d1fee [diff] |
resolved conflicts for merge of a2f747d4 to jb-mr2-dev-plus-aosp Change-Id: If79ba99ef01c8216b1cce5daffc98a989255ac84