| commit | 96f3af0727d809719f6b1a0f940d8525227399b0 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed Jul 13 07:41:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 13 07:41:50 2016 +0000 |
| tree | 39c1fc36c1c97f021598ba5ff3b1a1a0ddd9b55a | |
| parent | 1e049f93a28076ee1b19898d006b02028c164477 [diff] | |
| parent | f3a00957508edeb9e117819ea7a466f09a0de172 [diff] |
resolve merge conflicts of 41e82a3 to stage-aosp-master am: 2fedbf79bb am: ff198da422 Change-Id: Ia72b7361e915f364428512a1908b2efca11a2e15