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

* commit '56d1020af6826a4500f82799251e0a6f26ad305b':


Trivial merge