tree 2a239202081571ffea907bd0a9c28e764ed4a7ec
parent f5b8501759a71cac6cfddfb56c34a31d502c9c21
parent ce272c6b6b744c2b36a4c18c629006931205763d
author Sungsoo Lim <sungsoo@google.com> 1469866532 +0000
committer android-build-merger <android-build-merger@google.com> 1469866532 +0000

DO NOT MERGE: Fix CTS regression am: edc9238514  -s ours am: 0fb1075d95 am: f928b8062c am: 1fcc472b3e  -s ours am: 1559998d08 am: c3485668ad am: 174f17bc19 am: cf94d53469  -s ours am: accabefc6b
am: ce272c6b6b

Change-Id: I5c0af9c58bb75f7c62a540063fa1ffae3868d80a