OSDN Git Service

resolved conflicts for ddf53180 to stage-aosp-master
authorChristopher Wiley <wiley@google.com>
Mon, 14 Sep 2015 14:34:50 +0000 (07:34 -0700)
committerChristopher Wiley <wiley@google.com>
Mon, 14 Sep 2015 14:34:50 +0000 (07:34 -0700)
commit27a0be36eeee9d1d03076727977dfb1e725fcd77
tree986c8ee39b8906a1fb40b1bfba52d94e71085827
parent19694a0eeffd224189615ed761a5f8e4f912b343
parentddf53180e47cd4d31ba6bc762e98670898b040c9
resolved conflicts for ddf53180 to stage-aosp-master

Change-Id: I265ab876ef29dc731e6abb6f964c10f2e71324be