| commit | 7939aee8c1688bc8647c5bceb0d47a4e790ff27d | [log] [tgz] |
|---|---|---|
| author | Chien-Yu Chen <cychen@google.com> | Mon Mar 21 18:19:33 2016 -0700 |
| committer | Chien-Yu Chen <cychen@google.com> | Mon Mar 21 18:39:47 2016 -0700 |
| tree | 61ad95847a53290e813b12e4bd0442098eaf5e5b | |
| parent | 9b8e05d33167864a3dd46df13988e1ae57afb249 [diff] | |
| parent | d384306b8a5c2f106a02574c356d78a08e7894ac [diff] |
resolve merge conflicts of d384306 to nyc-dev-plus-aosp Change-Id: I288ea4c7b2f750460e8fb0fbcf8ecaebec3f2d53