| commit | f584321edc614c055b3b99bcca663b3015ccc193 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Wed May 21 05:49:22 2014 -0700 |
| committer | The Android Automerger <android-build@google.com> | Wed May 21 05:49:22 2014 -0700 |
| tree | c487a61f25e68829736ee81dc5ac1ba4e712f9b9 | |
| parent | 9e2595d7b6c246261fbbd8e35a99c2d2463fe4a8 [diff] | |
| parent | e49c966c249edf72ba16387e196765ab29a8cff2 [diff] |
merge in master-release history after reset to 9e2595d7b6c246261fbbd8e35a99c2d2463fe4a8