| commit | daa13eaa922670e08cc1a88a04b189e003dcf9ec | [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 | 60d33496d3bbc761fedca9e72629daae8085ed34 | |
| parent | fdad5af164af9db300c11b07e7a5606e96fa1034 [diff] | |
| parent | 3252d11498b386677163366e3d0d5bfdad17ba41 [diff] |
resolve merge conflicts of 3252d11 to nyc-dev-plus-aosp Change-Id: I2973439a194a3048d009159d75572a5366021f21