OSDN Git Service

am 38fe1f22: am 10e4a8d5: am 59d3e1db: Merge "Support for additional profile annotati...
authorThan McIntosh <thanm@google.com>
Wed, 9 Sep 2015 15:40:26 +0000 (15:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Sep 2015 15:40:26 +0000 (15:40 +0000)
* commit '38fe1f22b544eaf0402dbc5c03ca2390f2d2440e':
  Support for additional profile annotations.


Trivial merge