tree eb5fa4d14c38cf241a5c810ca95d425be6f44439
parent ba566a1da67dab2b971fb17f4479cf46cd730667
parent 82491d7dc276f0eb543c3465378fd58518e59432
author Chirantan Ekbote <chirantan@google.com> 1486694308 +0000
committer android-build-merger <android-build-merger@google.com> 1486694308 +0000

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

Change-Id: If46c2c0fe3558da71399375b92c4e94e50f2e9a9