| commit | cee0c941ed9c8fdb1379dcc92c3d75ef5f39750d | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Wed Nov 30 10:04:11 2016 -0800 |
| committer | Jordan Liu <jminjie@google.com> | Wed Nov 30 15:08:13 2016 -0800 |
| tree | d3e631bd1d1b14b2206fe8dd3b8e1af889790650 | |
| parent | ad299d38ff9dec1f2c227288f3cbf3076dbac893 [diff] | |
| parent | a578ae2aa178883acf34537eb838bc54d75f065a [diff] |
resolve merge conflicts of a578ae2 to stage-aosp-master Change-Id: I344ce44711edee385c64de4e6c52c64e6901820d