| commit | bce19ce7dff918c12604614a5e27d02b78e877a4 | [log] [tgz] |
|---|---|---|
| author | Calin Juravle <calin@google.com> | Thu Mar 17 17:24:21 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 17 17:24:22 2016 +0000 |
| tree | d03b2c72fad9a848095ec1734803e22880c6f95e | |
| parent | d344ab34612208e466e78b1162214d5ec1f95019 [diff] | |
| parent | 5b7de5976db625a853a0f82d94a6873eed15a174 [diff] |
Merge "resolve merge conflicts of c19c1c2 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp