Daniel Sandler a94e8df852 am 1d49a967: am c6fa5914: am 847bdf00: am 5b40e225: Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev ...

* commit '1d49a967ef6fe0c3594870cfc73045ab53ba77ac':
  Make the vertical navbar 48dp like the horizontal one.

2015-09-10 01:53:01 +00:00

..

java

resolved conflicts for 0fb3f695 to master.

2015-09-09 18:40:05 -07:00

jni

Merge "Load app resource as shared library."

2015-09-09 16:08:12 +00:00

res

am 1d49a967: am c6fa5914: am 847bdf00: am 5b40e225: Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev

2015-09-10 01:53:01 +00:00

tests

Merge "A new test for AnimatorSet's clone"

2015-09-04 22:20:22 +00:00