| commit | eefa2462d2297916f25d439c7368c99ce7c6b6a5 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Thu May 19 16:02:22 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Thu May 19 16:02:22 2016 -0700 |
| tree | 9e05555d39d9c9d9df3b32e1a826b05db1954e9b | |
| parent | 9536027454cfb336b45826562cda6978b6de6661 [diff] | |
| parent | d9e76537ad3bf641fda8ba5e7f8a23cd26392d6b [diff] |
resolve merge conflicts of 3252d11 to nyc-dev-plus-aosp Change-Id: I2973439a194a3048d009159d75572a5366021f21