tree d2ea8134eae46fa7997d9ccea29e0cb10bae95cd
parent c149bf0b4682ff95ea1174f0e04090475eaa09cf
parent 0843675e939088d7974616f442ab8cad03f286e3
author Sunny Goyal <sunnygoyal@google.com> 1470071669 +0000
committer android-build-merger <android-build-merger@google.com> 1470071669 +0000

Merge \"Build fix: Updating SDK for tests\" into ub-launcher3-calgary
am: 0843675e93

Change-Id: I0c7863bd507f64b00f1c5d497f56c4ac82064a3a