Merge "DO NOT MERGE Restore accidentally commented line" into marshmallow-cts-dev
authorDaniel Xie <dxie@google.com>
Fri, 20 Nov 2015 18:57:29 +0000 (18:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Nov 2015 18:57:29 +0000 (18:57 +0000)
commit4e2092b555b3ef3e5ea6e3eb798bca4b21e33dce
tree4296f2c87f9ac51ea230750574bccb046638e19e
parentc6d365645f8315dc84f1e3253e575f454be460db
parenta3571bc9c9f16c58a49cbb080da97223c807b2f5
Merge "DO NOT MERGE Restore accidentally commented line" into marshmallow-cts-dev
am: a3571bc9c9  -s ours

* commit 'a3571bc9c9f16c58a49cbb080da97223c807b2f5':
  DO NOT MERGE Restore accidentally commented line