| commit | 3bab28f9e98fb8e2aae8e170bebe0070b7abb3bb | [log] [tgz] |
|---|---|---|
| author | Jason Sams <jsams@google.com> | Fri Mar 14 00:22:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 00:22:45 2014 +0000 |
| tree | 4bf123f5deaf0a702347ef63b0f398bcaa4c521b | |
| parent | a9b8bf053ca5a1e81160422a38341c7dd4b4022d [diff] | |
| parent | 440613f5c35577f9a5bbc087b2e306e37bb8f94e [diff] |
am 440613f5: am 276565c8: am 0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build. * commit '440613f5c35577f9a5bbc087b2e306e37bb8f94e': Force merge of remaining KLP changes to fix build.