tree 02e3d00e2f0b8154a09a1c934fd859cf5f329ba5
parent 8eec26e2765d6e83f8509beb610caef936a11a35
parent 12f87a5b7728d4e5af251c33f448ac7fc1868abb
author Elliott Hughes <enh@google.com> 1383844080 -0800
committer Elliott Hughes <enh@google.com> 1383844080 -0800

resolved conflicts for merge of 12f87a5b to klp-dev-plus-aosp

Change-Id: I8ce0a86bbaae0c1e3ce5ed46de628ea22ea17d16