| commit | 822fe2a1afd0ee83ff48a21ae093bafcc77b1d2f | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Tue Oct 25 11:17:59 2016 -0700 |
| committer | Hall Liu <hallliu@google.com> | Tue Oct 25 13:41:59 2016 -0700 |
| tree | 3667f90f9cb70894f198d7dceb0a408ce876dfe2 | |
| parent | 8f98f10d53f4f7aa1605a37313a6186f90dc6c0e [diff] | |
| parent | 0d5cae00ebfff7cf043a19ce8f833dde1d7e1282 [diff] |
resolve merge conflicts of 0d5cae0 to stage-aosp-master Change-Id: I4787475841dac6a1c9ea841b48b664378d65a146