| commit | 188996ed375f0514c3f0cef73e7ecd44a72557b6 | [log] [tgz] |
|---|---|---|
| author | Ed Tam <etam@google.com> | Mon Apr 13 23:37:52 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Apr 13 23:37:52 2015 +0000 |
| tree | b1350343701dccd609de5b167199748145395b21 | |
| parent | 97a365f618b9359cdfce108f721a85a5c4690fdb [diff] | |
| parent | f846ffcc02a8c1a03ddc035f8fa5bb82130034a0 [diff] |
Merge "resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp