| commit | f8565cd3f30c60d8343dae3ca8c8bca18c5b451a | [log] [tgz] |
|---|---|---|
| author | Pavel Zhamaitsiak <pavelz@google.com> | Tue Apr 05 04:29:11 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 05 04:29:12 2016 +0000 |
| tree | 943f0d7f10d613eb5be2600c71e40daff9b291a0 | |
| parent | 39ca5c22808a8d7bd82c2fdbeaf4e389da450857 [diff] | |
| parent | ce13079ab3b49e315765a41d96ffab5fa6fb1b67 [diff] |
Merge "resolve merge conflicts of 20ebbb3 to nyc-dev" into nyc-dev