| commit | af52a806bb399136d4e8228b81b1c53c4064376a | [log] [tgz] |
|---|---|---|
| author | Calin Juravle <calin@google.com> | Thu Mar 03 11:51:26 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 03 11:51:26 2016 +0000 |
| tree | 712037a2a0ae4743a1fd842e19cf165094a22314 | |
| parent | dcd8e897d85d23f565816f40c77cc87b0d4bec12 [diff] | |
| parent | 78cb078dd2b6f665656a7473c40d82513a4c482f [diff] |
Merge "resolve merge conflicts of 7a2ff82b29 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp