| commit | d14586e35a3df39cc3aa6aff6a54463270a5e1a7 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Apr 29 23:20:37 2013 -0700 |
| committer | Kenny Root <kroot@google.com> | Mon Apr 29 23:20:37 2013 -0700 |
| tree | b1c1ce7f373b838d9b9a6a7e1375693091b2a7b3 | |
| parent | 14ad786183455ad9c8298e24946d4da0f24458d7 [diff] | |
| parent | a69af5af3daf7901bb66cd6318b6018a48b819f4 [diff] |
resolved conflicts for merge of a69af5af to jb-mr2-dev-plus-aosp Change-Id: If41560f0fef3103cad2172061a7988ceb5556377