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