| commit | 8bfa8a472e75e9101277fb29331b4c63452ec19f | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Fri Mar 14 17:20:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 17:20:02 2014 +0000 |
| tree | a69ec30ec9096ad5273976d9a90d1ef6c3d11e30 | |
| parent | 721464ffc47501e5894e4e442e05400b84e380e7 [diff] | |
| parent | 96fcaa0134061e2923a0677f20fb88914f175fa2 [diff] |
am 9049f721: (-s ours) am 76057155: am b47b996c: resolved conflicts for merge of 4cedd768 to klp-modular-dev * commit '9049f7215d01154d4aaf1b7f70049b5a81e46be4': Fix build break