| commit | 842b7f4492b385b92fb3266166208a1b16378a65 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Wed Nov 16 00:25:37 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 16 00:25:37 2016 +0000 |
| tree | b0605297b74ae918b10f34a37916e79e2ba63d13 | |
| parent | e431bddfcb424b25bd738a9f939e236ceac285de [diff] | |
| parent | dce5fa8511340c803f01daab473c134160266561 [diff] |
Merge remote-tracking branch 'aosp/upstream-new' into fix am: fb1f094f16 am: dce5fa8511 Change-Id: Ieef54d06a8c29b05f39cee4d2ecd3aa4d1b8769f