tree b83a20030a317016fe2cdba6d636450ce8edbbe1
parent 364d427ac6633878937e1c476650a2d7222ab8f8
parent bcce6e079bc57a70dfe6c3e6fe315a00a64b7c7e
author Daichi Hirono <hirono@google.com> 1493834936 +0000
committer android-build-merger <android-build-merger@google.com> 1493834936 +0000

Merge "DO NOT MERGE: Change GridViewTest to JUnit4 style" into nougat-mr1-cts-dev am: 730204f695  -s ours
am: bcce6e079b

Change-Id: I27595030a5ccad9ebdf42f7756a1ee34e69830d3