| commit | 669cacac70b56c72e520849e54ada458b36e23b1 | [log] [tgz] |
|---|---|---|
| author | Andriy Naborskyy <andriyn@google.com> | Fri Mar 25 01:06:47 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 25 01:06:48 2016 +0000 |
| tree | 83cf1c5c1fe9e7c0f1d6ad3405fee14808d26260 | |
| parent | fe952f3a0b0ad5c481fa3e52385866f777a4d6e2 [diff] | |
| parent | 815e51d76cc284f3ca59534d9f9372d3dd50f574 [diff] |
Merge "resolve merge conflicts of 0c7535b to nyc-dev" into nyc-dev