| commit | 792552ea729b197aae1859b4e6aa1b054a2be7a4 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Fri Oct 14 20:39:49 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 14 20:39:50 2016 +0000 |
| tree | b7642593e971e31f792cdb899a02bb05518a5469 | |
| parent | f229ca98adee833e0939bfb63d3bac04f7915d5d [diff] | |
| parent | b9c454380448c62306e42ab7d7e6485a1f65be9c [diff] |
Merge "resolve merge conflicts of e63a946 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp