| commit | 1703b3273b39acfdc64731bc50eea7c33c796c92 | [log] [tgz] |
|---|---|---|
| author | Evgenii Stepanov <eugenis@google.com> | Fri Jun 19 15:01:14 2015 -0700 |
| committer | Evgenii Stepanov <eugenis@google.com> | Fri Jun 19 15:01:14 2015 -0700 |
| tree | f595ffc1982ac26fc7ccbbe5979a0656e27dedb9 | |
| parent | a43f213c78ae37fc3a4829da99d9900cf18b2f6f [diff] | |
| parent | cb093b1cea7fe2ff2a2a69e54c24eb2ace53a8e1 [diff] |
resolved conflicts for merge of cb093b1c to mnc-dev-plus-aosp Change-Id: I6281796fe1cc41bd14b3ec10c01a75717c346e39