OSDN Git Service

am 7976b2be: resolved conflicts for merge of 0e23c5e3 to klp-modular-dev
authorBart Sears <bsears@google.com>
Mon, 9 Jun 2014 21:12:45 +0000 (21:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 9 Jun 2014 21:12:45 +0000 (21:12 +0000)
commit5c2225c592da49855dbc665edb9f03c18deddb78
tree888827d7aaa2019fb4e08e98aaff99c75282df7c
parent69d5bd7cbc873c86685c463ac3dc7ab8de9e71e7
parent7976b2be9e41dbf789ad31b331e355a0a949d00a
am 7976b2be: resolved conflicts for merge of 0e23c5e3 to klp-modular-dev

* commit '7976b2be9e41dbf789ad31b331e355a0a949d00a':
  MR2.1 - Version 4.4.4.  Here we go!  DO NOT MERGE