tree a9b2734817b2b0351f99d36a6b3db9eb74140a32
parent 6b779c6b61ec662f19f9ea30fd003c770799196c
parent 08df25419fd797aa0e8c22fc376fd8d3e071f0b9
author Elliott Hughes <enh@google.com> 1410201714 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1410201714 +0000

Merge "resolved conflicts for merge of c8f6b82f to lmp-dev-plus-aosp" into lmp-dev-plus-aosp