tree b40f532a067bd747435f68d6c311476db0f9ad44
parent 3d13a028b1b433021a48b151fade30bb064ce8f2
parent ab6458b6cedb72d59c6b25db098fa7416e607c7a
author Paul Stewart <pstew@google.com> 1486000776 +0000
committer android-build-merger <android-build-merger@google.com> 1486000776 +0000

Merge "Revert "Cumulative patch from commit a9491695b30a7f750dc45cb563d813b03f1d4b8d"" am: cad6c45da0 am: 3e2126d282 am: 48cd913984
am: ab6458b6ce

Change-Id: I1eafc2db6e0118499192fa279459eca51f621024