| commit | c9c4c77f368938af19270da5ce24d0b8a94ece77 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Tue Dec 18 22:50:50 2012 -0800 |
| committer | Colin Cross <ccross@android.com> | Tue Dec 18 22:50:50 2012 -0800 |
| tree | f7049a00131c89d1a8eb8980abf9f1a4a210d302 | |
| parent | 828b2ca0ae745ee0c061eaed581897dac8a6fe9c [diff] | |
| parent | 917e120f736f95292a40b6c7da9940d6369955e1 [diff] |
resolved conflicts for merge of 917e120f to jb-mr1-dev-plus-aosp Change-Id: I5f3176d4f4859e7cf70899173f28944fc3a678b4