| commit | 99c1a4168ba792437f298d31cd4631ff01661476 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Jun 17 18:19:28 2013 -0700 |
| committer | Colin Cross <ccross@android.com> | Mon Jun 17 18:19:28 2013 -0700 |
| tree | 32946bf44bf4ffc8eb656e1f60ab163923495844 | |
| parent | 520f4f060325496741f600692f3582536fa43a8f [diff] | |
| parent | 95a41f6b20c678c5f475558ac00ab449ffd1f481 [diff] |
resolved conflicts for merge of 95a41f6b to stage-aosp-master Change-Id: Icfae29edf989fb43a7f0b8bda188a9807f76a3b9