| commit | d9e61018626d3fedc6ab6169d5ad0d228bd71128 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Apr 28 21:22:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 28 21:22:01 2014 +0000 |
| tree | 513e8a39ae4c18e05bfe4a1fd276ecf9c623c9f3 | |
| parent | 8f6278df67a445ad33bed417a4fd69debe8f0ee1 [diff] | |
| parent | 10596fbcce710a76ffc7e917400df13af5c2ebcb [diff] |
am 05678e17: resolved conflicts for merge of 3ce4f3d0 to master * commit '05678e17e8c079a1c1c144e23e40a7a644a0b040': Track libcore.os' move to android.system.