| commit | c2045047735522f50bc1d2618280bd37306f18d2 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon Nov 17 10:53:46 2014 -0800 |
| committer | Ying Wang <wangying@google.com> | Mon Nov 17 10:56:26 2014 -0800 |
| tree | 99b4b7be6ceba782fe0328899592058a6bdda79a | |
| parent | e726680652ecd235496afeb3207b463e0aa83955 [diff] | |
| parent | 5c7bc931270f8b0955dddadac9ce6247217a9e3e [diff] |
resolved conflicts for merge of 5c7bc931 to lmp-mr1-dev-plus-aosp Change-Id: Id3130cf4a23f07953e06301fe93f1da54b9ca191