| commit | 7fc85fa3753d865ef29c2bd7e091b10488343f69 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Fri Jan 04 07:49:46 2013 -0800 |
| committer | The Android Automerger <android-build@android.com> | Fri Jan 04 07:49:46 2013 -0800 |
| tree | bbd00aa7aa768fc0550f0059b77f25dad783b0fe | |
| parent | 4392d2f09ba76496deac6bf2c13833a770f2236a [diff] | |
| parent | af6ea472344efab764b744ab1a2f20ab965bb250 [diff] |
merge in master-release history after reset to master