| commit | 561fdb44387a1377fd1cfac1c31e80850eb62022 | [log] [tgz] |
|---|---|---|
| author | Rom Lemarchand <romlem@android.com> | Mon Jan 11 19:00:42 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jan 11 19:00:42 2016 +0000 |
| tree | 542b67956483d455ca626542652ff0b0c1aa5fa5 | |
| parent | 383f816d6b5349e4be8ba2df9bebc59cf934e50a [diff] | |
| parent | 67914e234125ee70383dffafac20de0fbe21fd04 [diff] |
resolve merge conflicts of 1366cabc3d to stage-aosp-master. am: 8c64904f61 am: ceff2b0c0e am: 67914e2341 * commit '67914e234125ee70383dffafac20de0fbe21fd04':