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