Deepanshu Gupta af9fde9680 am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev ...

* commit '425addb94428d6f17658256a4acd4b62189c8844':
  Fix CalendarView to show the right labels. [DO NOT MERGE]

2014-05-13 17:18:55 +00:00

..

aapt

am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

2013-05-07 16:03:31 -07:00

aidl

…

layoutlib

resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

2014-05-13 09:49:18 -07:00

obbtool

…

orientationplot

…

preload

…

validatekeymaps

…

velocityplot

…