am b6f2873c: am 772e6410: am 70da7606: Merge "Update directory header to not pin the headers and update style" into lmp-dev

* commit 'b6f2873cc2f0ad74298393043d546fed82d61c6e':
  Update directory header to not pin the headers and update style
tree: 77cc2994553d5e9ef028c237082fc5d64386a383
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags