OSDN Git Service

am 74304f89: (-s ours) am 1bf37957: am db0f3e82: Merge "Allow "opaque" flag to be...
authorCraig Mautner <cmautner@google.com>
Wed, 19 Feb 2014 00:05:50 +0000 (00:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Feb 2014 00:05:50 +0000 (00:05 +0000)
* commit '74304f890e7341d9bb8a6fdadd9e5f4dda60a246':
  Allow "opaque" flag to be updated. DO NOT MERGE


Trivial merge