am 4492b2c6: Fix OPP crash and Call Log sort order.

Merge commit '4492b2c66cf3b26fd988f3b7f1f5df6cc9ed49f2' into gingerbread-plus-aosp

* commit '4492b2c66cf3b26fd988f3b7f1f5df6cc9ed49f2':
  Fix OPP crash and Call Log sort order.