commit | 267373285cc8914f8abcf582ad16361882f82c49 | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Mon Nov 03 12:59:11 2014 -0800 |
committer | Nick Kralevich <nnk@google.com> | Mon Nov 03 13:18:02 2014 -0800 |
tree | cb3683d8246adbb860c5edc7b591034cd5de8774 | |
parent | 64945b4002ad9e9d0a2adc8dfa286a3f5b611607 [diff] |
DO NOT MERGE: resync to AOSP mirror-aosp-master and stage-aosp-master should be identical, but they're not. Pull all missing changes from AOSP into stage. Bug: 18224704 Change-Id: Ibe42d00fa1c0b0f81e6c9a3becca338989d6eabc