| commit | 80de421b0ebc10e93dce7f3975ab5b0451c93ea8 | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Tue Oct 25 21:30:33 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 25 21:30:33 2016 +0000 |
| tree | ed26ada36f6f10c476aa72589a76483aefd87c7f | |
| parent | 4fa106b9f2e0bbcca969087822dc7f8bb9af9273 [diff] | |
| parent | 9ce32cd3c97e02016860bd078f67b56fdbd56488 [diff] |
resolve merge conflicts of 0d5cae0 to stage-aosp-master am: 822fe2a1af am: d47ee81711 am: 9ce32cd3c9 Change-Id: I4c2bedff6ebf0452a3613dbec9ba20abe1b319a4