OSDN Git Service

am 039fd00f: am 13c23df9: Merge "Manual \'cherry pick\' to fix CTS tests for MediaCon...
authorChristine Hallstrom <hallstrom@google.com>
Fri, 18 Sep 2015 22:06:38 +0000 (22:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Sep 2015 22:06:38 +0000 (22:06 +0000)
commitc4f196b661cb9d38f74fa7a1a5a4abb921980387
tree3cd2d3fa1a937b84fece2b05aac88af09a110913
parent4092eeb7f7b079a87c4583c713c0e6d2e208b3c4
parent039fd00fd2b499a871be8551d80d299120ff5595
am 039fd00f: am 13c23df9: Merge "Manual \'cherry pick\' to fix CTS tests for MediaControllerTest." into cw-e-dev

* commit '039fd00fd2b499a871be8551d80d299120ff5595':
  Manual 'cherry pick' to fix CTS tests for MediaControllerTest.
core/java/android/view/View.java