| commit | ca3641d600007177542c46358e1cff069adcf95b | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Oct 09 19:31:56 2014 -0700 |
| committer | Ying Wang <wangying@google.com> | Thu Oct 09 19:31:56 2014 -0700 |
| tree | a55eaae236b2f756dd93286daf111e1310aebbef | |
| parent | 6f1e56ad475ced0a3f8854bc4c4fac1ee2d5f37c [diff] | |
| parent | 3907c03e24a42513dae8544a19f3cefb813a1c54 [diff] |
resolved conflicts for merge of 3907c03e to lmp-mr1-dev-plus-aosp Change-Id: I6900c8cdf1d161fbcede73547fad1750df9abab6