| commit | 7c4c2e0ab8ed74ca346eec98219562bd33814d71 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Tue Jul 12 23:43:18 2016 -0700 |
| committer | Colin Cross <ccross@android.com> | Tue Jul 12 23:53:04 2016 -0700 |
| tree | 634edbcc2f5ad193f714bb2f9a4cefae13206392 | |
| parent | 80d510632cc8685fc4a1d4123eafbf035e054293 [diff] | |
| parent | 6ab82b8cc7bc2895587b34c2d341c59630bee8d4 [diff] |
resolve merge conflicts of 41e82a3 to stage-aosp-master Change-Id: I5a7faca3249f0c038914540b1dd29edf0084c0e1