OSDN Git Service

Merge remote-tracking branch 'goog/ics-aah-exp'
authorMike Lockwood <lockwood@google.com>
Thu, 22 Mar 2012 00:28:54 +0000 (17:28 -0700)
committerMike Lockwood <lockwood@google.com>
Thu, 22 Mar 2012 00:29:00 +0000 (17:29 -0700)
commit19ba8b4a85842a8aeaa9e785e5d4558bc4e8e32e
tree1c4b82f1f4882b54f3d9cd95c95af68af6e8f893
parent16252eb65e873420d47bd2e0fb6a2a7877342224
parentf8a303a7057aa4126f7a0c11355c86ffabc03be5
Merge remote-tracking branch 'goog/ics-aah-exp'

empty merge -s ours

Change-Id: Icaa928cc62272dad788a80b769b8a745e08cf2ca