tree 3034ba6466cc2b82d33fb769a97530ad0962b264
parent c866151926b7672a58a7312c8083612bdc567fb4
parent 9e413bf4e562d98b6efeb157369f152edd5f0261
author Greg Hackmann <ghackmann@google.com> 1393029352 -0800
committer Greg Hackmann <ghackmann@google.com> 1393029352 -0800

resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp

Change-Id: Ibc41f0248235afca9546829e00b31003d09f4f7e