| commit | 276565c83c05e24819454dea4008ad5096792e4f | [log] [tgz] |
|---|---|---|
| author | Jason Sams <jsams@google.com> | Thu Mar 13 18:02:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 18:02:03 2014 +0000 |
| tree | d5046b0b305b80c112706fc3af488f0090637bc7 | |
| parent | 35a9e339687a0c5423c3433ff0c335ad9e1e0656 [diff] | |
| parent | 0ebc6b378dca76b3253b10cf17c3a38a0a50c073 [diff] |
am 0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build. * commit '0ebc6b378dca76b3253b10cf17c3a38a0a50c073': Force merge of remaining KLP changes to fix build.