| commit | 8059e007678f6c7670781f2ad95bdce1d8472ad7 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Jun 06 15:45:23 2013 -0700 |
| committer | The Android Automerger <android-build@android.com> | Fri Jun 07 15:31:11 2013 -0700 |
| tree | c6d4ec3bc8382b53c85df320b0d3d008ce0fe6c6 | |
| parent | 14e26fe7c9a2d4e23c56bcb38e151cd4431ee3cf [diff] |
resolved conflicts for merge of 5d21820a to jb-mr2-dev Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31