| commit | 03d0a367cf8b229c12e51dc5f452deb710093b20 | [log] [tgz] |
|---|---|---|
| author | Wei Liu <luciferleo@google.com> | Tue Sep 20 10:21:27 2016 -0700 |
| committer | Wei Liu <luciferleo@google.com> | Tue Sep 20 10:25:51 2016 -0700 |
| tree | eec57799a02ba86792f370f45a5bea8488d03b33 | |
| parent | f97de8b1c5f21fa98cd145c35091e69eb15c28e0 [diff] | |
| parent | 82d5fc17b5f19b1fcd4533beb489b35b7ff58606 [diff] |
resolve merge conflicts of 82d5fc1 to master Test: device boots Change-Id: I78e5667577e413763b6be3b06a2feda99ef0d739