am 16560f1e: resolved conflicts for merge of fae59e8a to klp-dev-plus-aosp

* commit '16560f1e146c854bb006e22601dbcf6eac798167':
This commit is contained in:
Scott Main
2013-11-05 15:35:13 -08:00
committed by Android Git Automerger