tree 2135110bff4085ec90113a260f0a7eac519ba76b
parent fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f
parent 3028394c4691db9dec6bde04a7ed927e7501bd6a
author Narayan Kamath <narayan@google.com> 1414584757 +0000
committer Narayan Kamath <narayan@google.com> 1414584757 +0000

resolved conflicts for merge of 3028394c to stage-aosp-master

Change-Id: I980e4c95cdc6a4778cef3298338692656d23e7c6