OSDN Git Service

am 22a5c8b2: (-s ours) am 44c35ec4: Allow "opaque" flag to be updated. DO NOT MERGE
authorAndy McFadden <fadden@android.com>
Wed, 19 Feb 2014 00:05:51 +0000 (00:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Feb 2014 00:05:51 +0000 (00:05 +0000)
commit35571a41b3b8df0cad8fd73d5915f768db35f0d8
tree729c08920e3c68187c7703b5c6f5cf09a61f4a45
parent0380d5279b6d6a401703900bfd4c1b9b77c7c063
parent22a5c8b2e3c232a7cbe452759f20fc3c8382add7
am 22a5c8b2: (-s ours) am 44c35ec4: Allow "opaque" flag to be updated. DO NOT MERGE

* commit '22a5c8b2e3c232a7cbe452759f20fc3c8382add7':
  Allow "opaque" flag to be updated. DO NOT MERGE