| commit | 828b2ca0ae745ee0c061eaed581897dac8a6fe9c | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Tue Dec 18 16:11:23 2012 -0800 |
| committer | Colin Cross <ccross@android.com> | Tue Dec 18 16:11:23 2012 -0800 |
| tree | f7049a00131c89d1a8eb8980abf9f1a4a210d302 | |
| parent | 066c268bb596d7188091278e92638575765e6e98 [diff] | |
| parent | f69ebaba431e98a70c2151a83c4b102de89885aa [diff] |
resolved conflicts for merge of f69ebaba to jb-mr1-dev-plus-aosp Change-Id: Ia1c7025ab3d14f2d47e07acf58e161624d94c07c