| commit | 3ae58d366846a5b37ef0c685d1d69781c8c09ce8 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Fri Jun 06 15:41:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 06 15:41:50 2014 +0000 |
| tree | aeaffbbd2de14e7a71b817092f97e03a283ad81a | |
| parent | d060e74aa56a76d5b6f5f660a711956238b299a1 [diff] | |
| parent | 259d4072b1e995b7d31a01187477e8e494e47758 [diff] |
am 259d4072: merge in master-release history after reset to 60e4ab06acb240bb910bab5f2a4bf64de2bced56 * commit '259d4072b1e995b7d31a01187477e8e494e47758':