commit | 7f590e25c76891c3839a282635b5932af23812df | [log] [tgz] |
---|---|---|
author | Mathieu Chartier <mathieuc@google.com> | Fri Sep 12 19:46:28 2014 -0700 |
committer | Brian Carlstrom <bdc@google.com> | Wed Sep 17 22:46:45 2014 -0700 |
tree | 38ea385029903068f5e8753a0ab154026c7238de | |
parent | 79bbbe2d79811d4e86486cb8bc2b49e9a2b3c0d9 [diff] |
Restore some aosp/master changes lost in cherry-pick 7c438b19b71932ac8a44eff44f20744a01559c8d Change-Id: Ic9fe8a235baac85efbdf748aeaddf98139558c4e