| commit | 50137f2c80d39531950095d58f19410a2d7e2cd7 | [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 | d6402408049c36d33290514b4f5ce2350d32417f [diff] | |
| parent | 3c40553ff6e2b9e800f963ea6e071ea30097ed42 [diff] |
resolve merge conflicts of 3252d11 to nyc-dev-plus-aosp Change-Id: I2973439a194a3048d009159d75572a5366021f21