| commit | 449828160ad1d7519fba690b10fe6efa5af1b7c6 | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Wed Oct 19 20:44:42 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 19 20:44:42 2016 +0000 |
| tree | 8a401bd9adff427425b6738e6c92faaaee8aae7f | |
| parent | 6b2214024e0e0615d97346f8ee3114f726333896 [diff] | |
| parent | 998e8e5c26b7fe9008296f7379c1b7ae1ccf13e8 [diff] |
resolve merge conflicts of 9cd6f0c to stage-aosp-master am: 998e8e5c26 Change-Id: Ifb4479ae4ca2e090dd8f6eb0f383207ba3a22338