Zhentao Sun af67d49865 am b97782f2: am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev ...

* commit 'b97782f2dac9714e4b6037a6d82a259f32816a5a':
  Fixed a leak in GeofenceHardwareImpl.java.

2014-12-09 00:16:01 +00:00

..

java

am b97782f2: am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev

2014-12-09 00:16:01 +00:00

jni

resolved conflicts for merge of 203c8171 to master

2014-12-04 16:06:34 -08:00

res

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base

2014-12-08 20:29:25 +00:00

tests

Merge "Allow compilation with Jack."

2014-12-04 09:26:54 +00:00