| commit | b2416d8e5c6ce31edb40df6fb3998716940575b9 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Fri Jul 31 10:01:09 2015 -0700 |
| committer | Tao Bao <tbao@google.com> | Fri Jul 31 10:01:09 2015 -0700 |
| tree | 561e10f3ff0342053fb31aeebff9ca62fd48d199 | |
| parent | 23dfd922a6f53dc829c5765ef4a687d967f98244 [diff] | |
| parent | bbb41a7097c44a6dbfe1a7ee369037b4f11c745b [diff] |
resolved conflicts for merge of bbb41a70 to mnc-dr-dev-plus-aosp Change-Id: Icc2ed1632cf023785ddfbae09478ea0ffb025167