tree b40f532a067bd747435f68d6c311476db0f9ad44
parent ac8397fb18d0258e8ca2ce96f99a7364573fff9c
parent cad6c45da0fded3f6a1fa7d0af4e61bbc65ce7c6
author Paul Stewart <pstew@google.com> 1486000323 +0000
committer android-build-merger <android-build-merger@google.com> 1486000323 +0000

Merge "Revert "Cumulative patch from commit a9491695b30a7f750dc45cb563d813b03f1d4b8d""
am: cad6c45da0

Change-Id: Iab5e2aedea747cbc787fb2ca7082caae857f83a1