| commit | 07d35c37ce79a64bdd905b394d40fc9bbb18fa60 | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <[email protected]> | Thu Sep 18 20:40:22 2014 +0000 |
| committer | Gerrit Code Review <[email protected]> | Thu Sep 18 20:40:22 2014 +0000 |
| tree | e8787c45e494dfcc558faf0f75956f8785c39b94 | |
| parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb [diff] | |
| parent | b5fb31ef6a38f19404859755dbd2e345215b97bf [diff] |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"