| commit | d18b0a4ca0d7f4651cd12d60413820e90ff96328 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Wed May 04 22:40:43 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 04 22:40:43 2016 +0000 |
| tree | fc0e58697d79db42fd9ffc9e2cacbfcccc441a3f | |
| parent | a5433a82cc86f4d6daa571f1a102626563595d0d [diff] | |
| parent | a7106e11bd93c873fe18181539fc1417344c3992 [diff] |
resolve merge conflicts of 0b546c4 to nyc-dev-plus-aosp am: 19e838ba39 am: a7106e11bd * commit 'a7106e11bd93c873fe18181539fc1417344c3992': Change-Id: I3f980609a95b4c8f96c779c9b66a3a34850e0ce5