merge htcdev source bb0e22e
config: update tripndroid config