tree eb5fa4d14c38cf241a5c810ca95d425be6f44439
parent 764b31ce4b0f77f04a47f981b970bf53fae98860
parent 3fc2b355f1114ab5e708271cbe86b36aeab937fb
author Chirantan Ekbote <chirantan@google.com> 1486694158 +0000
committer android-build-merger <android-build-merger@google.com> 1486694158 +0000

Fix broken unit tests am: 8c13d104c2
am: 3fc2b355f1

Change-Id: Ic565fe905e7df7756a9e063001921c6a2afddfcf