am c04a5df9: am f114e3d9: am b1ad8e9e: Merge changes from topic \'tron\' into mnc-dev

* commit 'c04a5df9c52fe026f1d0188eb092f12d0ad62505':
  remove unused edge border dimension.
  log clear all button
tree: a3e1c4993283fac252d75693a6d997b246f1a1aa
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py