| commit | 440613f5c35577f9a5bbc087b2e306e37bb8f94e | [log] [tgz] |
|---|---|---|
| author | Jason Sams <jsams@google.com> | Thu Mar 13 18:08:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 18:08:31 2014 +0000 |
| tree | d3991073f15b8526db2208527864ba0284b287a6 | |
| parent | 21f97de0bc4871cd8759aa8edbf55eb97d4a6ff2 [diff] | |
| parent | 276565c83c05e24819454dea4008ad5096792e4f [diff] |
am 276565c8: am 0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build. * commit '276565c83c05e24819454dea4008ad5096792e4f': Force merge of remaining KLP changes to fix build.