| commit | 5131171a2eaafcd9de3ad4f8fdbabf5dc34f9304 | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Mon Jun 06 17:32:49 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 06 17:32:50 2016 +0000 |
| tree | e0d63699766550e0c12bdecab9218d7b9fc43ce7 | |
| parent | c9d37aba6beaafe54a5738274de36dda419d395f [diff] | |
| parent | 2c7dc858313e5baef35462f3852884a6d4f87289 [diff] |
Merge "resolve merge conflicts of a87e5f8 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp