tree c44ec16b92652caec8259db9e472fb6f77a480df
parent 5d4deb8246b13531a6b2b7611c650ba504e44dc6
parent 3c8cf51f86538e7c580c5574108be825ef00c534
author Andreas Gampe <agampe@google.com> 1414554173 -0700
committer Andreas Gampe <agampe@google.com> 1414554173 -0700

resolved conflicts for merge of 3c8cf51f into stage-aosp-master

Change-Id: I507358be6186c4b8d1968cd4e370afe9fd1a02eb