| commit | af6ea472344efab764b744ab1a2f20ab965bb250 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Thu Jan 03 07:50:00 2013 -0800 |
| committer | The Android Automerger <android-build@android.com> | Thu Jan 03 07:50:00 2013 -0800 |
| tree | 0a101b637e658a80b845d213c78f17c9eec0ad44 | |
| parent | 642530cc99f8dc7c743da3ac1ee971138f924f49 [diff] | |
| parent | 40fbf6e9d3994979f9e407165e193dd4c4883f0b [diff] |
merge in master-release history after reset to master