OSDN Git Service

resolved conflicts for merge of 2bf3800b to stage-aosp-master
authorCraig Mautner <cmautner@google.com>
Fri, 24 Oct 2014 20:12:08 +0000 (13:12 -0700)
committerCraig Mautner <cmautner@google.com>
Fri, 24 Oct 2014 20:12:08 +0000 (13:12 -0700)
commit9d9aac4cacce75b4847aebce0f019250dc3b4e93
tree9e74435ad8e21fe6ace6a1c49ca2f596c60ced34
parent5a71f83227f0340a265f34b226d8fe01d4dd9773
parent2bf3800b10e1cc9a291527fc83efc986ba83aa37
resolved conflicts for merge of 2bf3800b to stage-aosp-master

Change-Id: I3e650f90521e4d615504c3423ab228966389a482