Merge remote branch 'goog/ics-mr1' into ics-aah
tree: 6f168de40f457cecf769cd68f7328ad48a2fc5f0
  1. liblog/
  2. logcat/
  3. logwrapper/