Merge "DO NOT MERGE Restore accidentally commented line" into marshmallow-cts-dev...
authorDaniel Xie <dxie@google.com>
Mon, 11 Jan 2016 19:51:01 +0000 (19:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:51:01 +0000 (19:51 +0000)
commit56d1020af6826a4500f82799251e0a6f26ad305b
tree92f018857dcb963f23b429f699c3c627fde154d4
parent2deb383800bef7f3def7322fa77fd1b95ee7e65a
parent2239f84a37e3288e49523e98d5bb964ba62143b6
Merge "DO NOT MERGE Restore accidentally commented line" into marshmallow-cts-dev am: a3571bc9c9  -s ours am: 4e2092b555
am: 2239f84a37  -s ours

* commit '2239f84a37e3288e49523e98d5bb964ba62143b6':