Merge "DO NOT MERGE Restore accidentally commented line" into marshmallow-cts-dev...
authorDaniel Xie <dxie@google.com>
Mon, 23 Nov 2015 15:52:57 +0000 (15:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Nov 2015 15:52:57 +0000 (15:52 +0000)
commitc3fef93d9715ac6419542cfded8362923a6a7bec
tree1615aac082e0e90acc42bf2dcf348488ed10bfc1
parentbdc383d45d7ce4066f1505ed7692f4d6ade3454a
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':
  DO NOT MERGE Restore accidentally commented line