| commit | 2fedbf79bb29960a4d3a9b632f75f13f876164c9 | [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 | 4e8bb3e67762c78858846330df5f6ccd80feae21 [diff] | |
| parent | 41e82a3ca506857bd54d998b4f5e13910f09f250 [diff] |
resolve merge conflicts of 41e82a3 to stage-aosp-master Change-Id: I5a7faca3249f0c038914540b1dd29edf0084c0e1