OSDN Git Service

Merge "Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181...
authorAdarsh Fernando <adarshf@google.com>
Tue, 24 May 2016 20:26:13 +0000 (20:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 May 2016 20:26:13 +0000 (20:26 +0000)
commitb696fb0f262032d68b36795c430e535dc16cf10e
tree6a3fb9b499236cd9b87c45e1ddc3133962a0b66a
parentf6fbfce696118c54ec87eccbeb6a0d8e1f64331d
parent0fbfc4b6895679fa20f810c88302aee10b6da656
Merge "Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am: fa6e151d5d" into nyc-mr1-dev-plus-aosp
am: 0fbfc4b689

* commit '0fbfc4b6895679fa20f810c88302aee10b6da656':

Change-Id: I4ae79004d47bd3e282f358dba14e9b2d0c5279dd