Jon Larimer ff526fa710 am 3a6d8f54: am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation ...

* commit '3a6d8f5473f2451a0bdf13d4cc1d31e419d23f0c':
  Fix build breakage in older branches by avoiding <> notation

2015-01-30 22:40:17 +00:00

..

java

Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c565a56

2015-01-30 15:56:00 +00:00

jni

am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

2015-01-27 23:02:57 +00:00

res

am f607fa6b: am d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev

2015-01-30 03:32:33 +00:00

tests

am 3a6d8f54: am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation

2015-01-30 22:40:17 +00:00