tree 8959bc8589ef2b9432a6cce6bac145650b554d6a
parent 5aced732888f8737c9c30ddf6e2e16ee911c4a54
parent 6ee07507ad3c69aed6d84e2082afa9c66aab7788
author Elliott Hughes <enh@google.com> 1376413882 -0700
committer Elliott Hughes <enh@google.com> 1376413882 -0700

resolved conflicts for merge of 6ee07507 to jb-mr1-dev-plus-aosp

Change-Id: Iea67d0b1dd161ea565d31af29f15ee5c1892915e