| commit | af15bf805176ee566877b297a4380b99c15da715 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Wed Oct 16 17:52:15 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 16 17:52:15 2013 -0700 |
| tree | 30cfcaad2ea5235d48cca6963e211ae270674385 | |
| parent | 46644a831d966e3c19242d5131200fa068182b12 [diff] | |
| parent | a7acd0c4bfcee184da3156425b48b0ef4956eb41 [diff] |
am 26c21afd: merge in klp-release (no-op) * commit '26c21afddde82f26afe7a3dc72c3ccede328ef7c':