| commit | 3f9ad73b8fea8954b3675e14167e8767d138516d | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Fri Mar 14 00:46:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 00:46:06 2014 +0000 |
| tree | 61f8c808110448fde72484fec8a960f289473956 | |
| parent | 544442a0ba1fb290fceeb40350b02dd4c484b383 [diff] | |
| parent | 4a20bd1c407c007318e643f47695b144fdb735e3 [diff] |
am b47b996c: resolved conflicts for merge of 4cedd768 to klp-modular-dev * commit 'b47b996c58c1dc0d5e6c3e3381765a94c11d7a40': Fix build break