| commit | 6d24d4ff06a042ca1c716bea5acbca9733b3a96f | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Sep 18 05:49:49 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Sep 18 05:49:49 2014 +0000 |
| tree | 38ea385029903068f5e8753a0ab154026c7238de | |
| parent | 79bbbe2d79811d4e86486cb8bc2b49e9a2b3c0d9 [diff] | |
| parent | 7f590e25c76891c3839a282635b5932af23812df [diff] |
Merge "Restore some aosp/master changes lost in cherry-pick 7c438b19b71932ac8a44eff44f20744a01559c8d"