| commit | ca30f00fc580ed8778124e84b683391108cc838b | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Sat May 17 05:49:29 2014 -0700 |
| committer | The Android Automerger <android-build@google.com> | Sat May 17 05:49:29 2014 -0700 |
| tree | b48fed77e1336157df75bb8fd96f4e8cdf1a05f7 | |
| parent | 76ab2d2568d6973041e296197e3bbd76366728a1 [diff] | |
| parent | 17a2c30e4e08a5633fbd0cbc8643182bfae4f0c4 [diff] |
merge in master-release history after reset to 76ab2d2568d6973041e296197e3bbd76366728a1