tree 38ea385029903068f5e8753a0ab154026c7238de
parent 79bbbe2d79811d4e86486cb8bc2b49e9a2b3c0d9
author Mathieu Chartier <mathieuc@google.com> 1410576388 -0700
committer Brian Carlstrom <bdc@google.com> 1411019205 -0700

Restore some aosp/master changes lost in cherry-pick 7c438b19b71932ac8a44eff44f20744a01559c8d

Change-Id: Ic9fe8a235baac85efbdf748aeaddf98139558c4e