Merge "DO NOT MERGE Restore accidentally commented line" into marshmallow-cts-dev...
authorDaniel Xie <dxie@google.com>
Mon, 11 Jan 2016 19:54:53 +0000 (19:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:54:53 +0000 (19:54 +0000)
am: 207693dbde  -s ours

* commit '207693dbde69b46c97a410251af33ee4054626c8':


Trivial merge