OSDN Git Service

am 7c3fb240: resolved conflicts for merge of e206e7c9 to jb-mr1-dev-plus-aosp
authorNick Kralevich <nnk@google.com>
Fri, 19 Oct 2012 22:08:26 +0000 (15:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Oct 2012 22:08:26 +0000 (15:08 -0700)
commitc520cb633e9d31c34a37f8dcca2329877336efba
tree3420338f3dbc8d3718dc289435055d284a817886
parent6b63e6c5d3ab76ee72fb9aace44d2717f5989fbf
parent7c3fb24095a3f6cf2ca6e25ddb4af24933ff3e4d
am 7c3fb240: resolved conflicts for merge of e206e7c9 to jb-mr1-dev-plus-aosp

* commit '7c3fb24095a3f6cf2ca6e25ddb4af24933ff3e4d':
  Push to AOSP