| commit | 6071c3dcf69af9e0f8525ba2cfa31bd4b8e63d0e | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Mon Oct 07 01:28:57 2013 -0400 |
| committer | Daniel Sandler <dsandler@android.com> | Mon Oct 07 01:28:57 2013 -0400 |
| tree | 87858416a26c8b629b607cc7dd6e48c0ac8e2129 | |
| parent | 13431ad822a6479c8512ea4a6ab799e2f5b46d97 [diff] |
Fix build. API changes in patch bd95740648372449a4d5c164d7050eee352d4c24 (change If667a55b merged from klp-dev) conflicted with aaca5d888a0dfdb6f9b7fdb6a6cf34f6a23ef68b (change I7c22c1ff). Change-Id: I477d088f22aa80fc37a9ac78834bfcb5c11922ca