OSDN Git Service

am 4b20d402: Merge "Only mark repeated keys as PASS_TO_USER if the original key was...
authorMichael Wright <michaelwr@google.com>
Fri, 26 Sep 2014 01:47:01 +0000 (01:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 26 Sep 2014 01:47:01 +0000 (01:47 +0000)
* commit '4b20d40218a25adcad21cc135a3103b4e04940f3':
  Only mark repeated keys as PASS_TO_USER if the original key was.


Trivial merge