tree eb5fa4d14c38cf241a5c810ca95d425be6f44439
parent 7e8d5acfd62f4ab849313ac643b4927bc686807b
parent 8c13d104c2a8f0c0db2ebf872fc1f5fa790bfcc5
author Chirantan Ekbote <chirantan@google.com> 1486694037 +0000
committer android-build-merger <android-build-merger@google.com> 1486694037 +0000

Fix broken unit tests
am: 8c13d104c2

Change-Id: I481aec5932d8bc7d9a61a50208adcc1b0803d787