| commit | 5d66e8f9c4634203870e4bc3bc7bf2536f40cc6f | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Wed May 21 05:50:43 2014 -0700 |
| committer | The Android Automerger <android-build@google.com> | Wed May 21 05:50:43 2014 -0700 |
| tree | e25767fd5a2eb8b47efa7696c50da214f32410aa | |
| parent | 90edbb112ad62c5528deb99828ec0f3a9136d4e1 [diff] | |
| parent | e39f7b7aedfd92027d17f03583953e6f8144a1f0 [diff] |
merge in master-release history after reset to 3c26b6cd3b6bf95cac3997ac95a229d2b8786ac2