| commit | 0a870594527a3af036b1238983abfe4e6118178b | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Thu May 19 16:22:09 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Thu May 19 16:22:09 2016 -0700 |
| tree | 00fb32ee1aececd738f876f1ab243529b8fddecc | |
| parent | 93510f46e0f4be83fae3a81fb7aac61de8728b42 [diff] | |
| parent | 404e2b21fc197ab8ad889eef5146845e56eca88d [diff] |
resolve merge conflicts of 404e2b2 to nyc-dev-plus-aosp Change-Id: I3c486e83a3f2b27ee0e6bfe4e3bba3df3af758a5